Fix exception IP in JIT #13929
Merged
Fix exception IP in JIT #13929
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dstogov
reviewed
Apr 10, 2024
| | mov IP, aword [IP + (struct.._offset + offsetof(zend_..struct, field))] | ||
| | lea IP, aword [IP + (struct.._offset + offsetof(zend_..struct, field))] |
dstogov
reviewed
Apr 10, 2024
ext/opcache/jit/zend_jit_x86.dasc
Outdated
| @@ -1884,6 +1884,9 @@ static int zend_jit_leave_throw_stub(dasm_State **Dst) | |||
| |5: | |||
| | // opline = EG(exception_op); | |||
| | LOAD_IP_ADDR_ZTS executor_globals, exception_op | |||
| || if (ZEND_OBSERVER_ENABLED) { | |||
There was a problem hiding this comment.
I would recommend to remove the if (ZEND_OBSERVER_ENABLED) { condition.
We already have the corresponding unconditional STORE in master.
dstogov
approved these changes
Apr 10, 2024
bwoebi
force-pushed
the
fix-exception-ip
branch
from
b88af78 to
b22acaf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not sure why IP was being loaded the dereferenced value of EG(exception_op), being the ZEND_EXCEPTION_HANDLER itself rather than &EG(exception_op)[0].
I believe that was wrong. I'm surprised the code worked at all...
This fixes the current failures in nightly github actions too: https://github.com/php/php-src/actions/runs/8608918170/job/23592077166
Please verify @dstogov.